78. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-11-18 03:12:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

78.1 Files compared

#LocationFileLast Modified
1Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailcreditmemo_new.html2016-06-21 09:41:00 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Sales/emailcreditmemo_new.html2022-11-02 03:38:42 +0000

78.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged7156
Changed510
Inserted13
Removed00

78.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

78.4 Active regular expressions

No regular expressions were active.

78.5 Comparison detail

1 <!-- 1 <!--
2 /** 2 /**
3  * Copyright © 2016 Magento. All rights reserved. 3  * Copyright © 2016 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 --> 6 -->
7 <!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @--> 7 <!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
8 <!--@vars { 8 <!--@vars {
9 "var formattedBillingAddress|raw":"Billing Address", 9 "var formattedBillingAddress|raw":"Billing Address",
10 "var comment":"Credit Memo Comment", 10 "var comment":"Credit Memo Comment",
11 "var creditmemo.increment_id":"Credit Memo Id", 11 "var creditmemo.increment_id":"Credit Memo Id",
12 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid", 12 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
13 "var this.getUrl($store, 'customer/account/')":"Customer Account URL", 13 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
14 "var order.getCustomerName()":"Customer Name", 14 "var order.getCustomerName()":"Customer Name",
15 "var order.increment_id":"Order Id", 15 "var order.increment_id":"Order Id",
16 "var payment_html|raw":"Payment Details", 16 "var payment_html|raw":"Payment Details",
17 "var formattedShippingAddress|raw":"Shipping Address", 17 "var formattedShippingAddress|raw":"Shipping Address",
18 "var order.getShippingDescription()":"Shipping Description", 18 "var order.getShippingDescription()":"Shipping Description",
19 "var order.shipping_description":"Shipping Description" 19 "var order.shipping_description":"Shipping Description"
20 } @--> 20 } @-->
21 {{template config_path="design/email/header_template"}} 21 {{template config_path="design/email/header_template"}}
22  22 
23 <table> 23 <table>
24     <tr class="email-intro"> 24     <tr class="email-intro">
25         <td> 25         <td>
26             <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p> 26             <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
27             <p> 27             <p>
28                 {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} 28                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
29                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} 29                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
    30                 {{depend store_hours}}
    31                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
    32                 {{/depend}}
30             </p> 33             </p>
31             <p> 34             <p>
32                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}} 35                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
33             </p> 36             </p>
34         </td> 37         </td>
35     </tr> 38     </tr>
36     <tr class="email-summary"> 39     <tr class="email-summary">
37         <td> 40         <td>
38             <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}</h1> 41             <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}</h1>
39         </td> 42         </td>
40     </tr> 43     </tr>
41     <tr class="email-information"> 44     <tr class="email-information">
42         <td> 45         <td>
43             {{depend comment}} 46             {{depend comment}}
44             <table class="message-info"> 47             <table class="message-info">
45                 <tr> 48                 <tr>
46                     <td> 49                     <td>
47                         {{var comment|escape|nl2br}} 50                         {{var comment|escape|nl2br}}
48                     </td> 51                     </td>
49                 </tr> 52                 </tr>
50             </table> 53             </table>
51             {{/depend}} 54             {{/depend}}
52             <table class="order-details"> 55             <table class="order-details">
53                 <tr> 56                 <tr>
54                     <td class="address-details"> 57                     <td class="address-details">
55                         <h3>{{trans "Billing Info"}}</h3> 58                         <h3>{{trans "Billing Info"}}</h3>
56                         <p>{{var formattedBillingAddress|raw}}</p> 59                         <p>{{var formattedBillingAddress|raw}}</p>
57                     </td> 60                     </td>
58                     {{depend order.getIsNotVirtual()}} 61                     {{depend order_data.is_not_virtual}}
59                     <td class="address-details"> 62                     <td class="address-details">
60                         <h3>{{trans "Shipping Info"}}</h3> 63                         <h3>{{trans "Shipping Info"}}</h3>
61                         <p>{{var formattedShippingAddress|raw}}</p> 64                         <p>{{var formattedShippingAddress|raw}}</p>
62                     </td> 65                     </td>
63                     {{/depend}} 66                     {{/depend}}
64                 </tr> 67                 </tr>
65                 <tr> 68                 <tr>
66                     <td class="method-info"> 69                     <td class="method-info">
67                         <h3>{{trans "Payment Method"}}</h3> 70                         <h3>{{trans "Payment Method"}}</h3>
68                         {{var payment_html|raw}} 71                         {{var payment_html|raw}}
69                     </td> 72                     </td>
70                     {{depend order.getIsNotVirtual()}} 73                     {{depend order_data.is_not_virtual}}
71                     <td class="method-info"> 74                     <td class="method-info">
72                         <h3>{{trans "Shipping Method"}}</h3> 75                         <h3>{{trans "Shipping Method"}}</h3>
73                         <p>{{var order.getShippingDescription()}}</p> 76                         <p>{{var order.shipping_description}}</p>
74                     </td> 77                     </td>
75                     {{/depend}} 78                     {{/depend}}
76                 </tr> 79                 </tr>
77             </table> 80             </table>
78             {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}} 81             {{layout handle="sales_email_order_creditmemo_items" creditmemo_id=$creditmemo_id order_id=$order_id}}
79         </td> 82         </td>
80     </tr> 83     </tr>
81 </table> 84 </table>
82  85 
83 {{template config_path="design/email/footer_template"}} 86 {{template config_path="design/email/footer_template"}}

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.